Merge from trunk.

diff --cc ChangeLog
Simple merge

diff --cc etc/NEWS
Simple merge

diff --cc lib-src/ChangeLog
Simple merge

diff --cc src/ChangeLog
index c903b1747828d6e26151614108f80c85210dc00c,efe40f1b7f5811a36d04c9d0b838e88be628de6c..ba0466836d00014ddb62a00f42c90f76033c4bd5
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,16 -1,16 +1,29 @@@
+ 2012-04-15  Andreas Schwab  <schwab@linux-m68k.org>
+ 
+       * lisp.h (struct Lisp_Symbol): Remove explicit padding.
+       (struct Lisp_Misc_Any): Likewise.
+       (struct Lisp_Free): Likewise.
+       * alloc.c (union aligned_Lisp_Symbol): Define.
+       (SYMBOL_BLOCK_SIZE, struct symbol_block): Use union
+       aligned_Lisp_Symbol instead of struct Lisp_Symbol.
+       (union aligned_Lisp_Misc): Define.
+       (MARKER_BLOCK_SIZE, struct marker_block): Use union
+       aligned_Lisp_Misc instead of union Lisp_Misc.
+       (Fmake_symbol, allocate_misc, gc_sweep): Adjust
+ 
 +2012-04-14  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      configure: new option --enable-gcc-warnings (Bug#11207)
 +      * Makefile.in (C_WARNINGS_SWITCH): Remove.
 +      (WARN_CFLAGS, WERROR_CFLAGS): New macros.
 +      (ALL_CFLAGS): Use new macros rather than old.
 +      * process.c: Ignore -Wstrict-overflow to work around GCC bug 52904.
 +      * regex.c: Ignore -Wstrict-overflow.  If !emacs, also ignore
 +      -Wunused-but-set-variable, -Wunused-function, -Wunused-macros,
 +      -Wunused-result, -Wunused-variable.  This should go away once
 +      the Emacs and Gnulib regex code is merged.
 +      (xmalloc, xrealloc): Now static.
 +
  2012-04-14  Paul Eggert  <eggert@cs.ucla.edu>
  
        Make GC_MAKE_GCPROS_NOOPS the default (Bug#9926).